From: Glenn Morris <rgm@gnu.org>
Date: Sun, 26 Jun 2011 18:10:51 +0000 (-0700)
Subject: ChangeLog fix.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~3309
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=dda242e96c70fedefaa4dd55080b57c50b62d4f8;p=emacs.git

ChangeLog fix.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5aec2a8f7ee..2fbe063ceca 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -997,7 +997,6 @@
 	* iswitchb.el (iswitchb-window-buffer-p): Use `member' instead of
 	`memq' (Bug#8799).
 
->>>>>>> MERGE-SOURCE
 2011-06-02  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* subr.el (make-progress-reporter): Add "..." by default (bug#8785).